Merging problems in modern version control systems

Merging Rules: Preliminary Version

In this paper we consider the merging of rules or conditionals. In contrast to other approaches, we do not invent a new approach from scratch, for one particular kind of rule, but we are interested in ways to generalize existing revision and merging operators from belief merging to rule merging. First, we study ways to merge rules based on only a notion of consistency of a set of rules, and ill...

Version Control in Hypertext Systems

Version Control Systems

Classic centralized Version Control Systems have proven that they can accelerate and simplify the software development process, but one must also consider distributed systems in this analysis. What features can distributed Version Control Systems offer and why are they interesting? This paper describes the general concepts of the centralized and the distributed approaches, how Concurrent Versio...

Auditable Version Control Systems

Version control provides the ability to track and control changes made to the data over time. Software development often relies on a Version Control System (VCS) to automate the management of source code, documentation and configuration files. The VCS system stores all the changes to the data into a repository, such that any version of the data can be retrieved at any time in the future. Due to...

Version Control Systems

S ane programmers don't write production code without the help of an editor and an interpreter or a compiler, yet I've seen many software projects limping along without using a version control system. We can explain this contrast if we think in terms of the increased start-up costs and delayed gratification associated with adopting a VCS. We humans typically discount the future, and therefore i...